gsk: Fix shader gresource paths
authorAlexander Mikhaylenko <alexm@gnome.org>
Mon, 19 Apr 2021 14:59:58 +0000 (19:59 +0500)
committerAlexander Mikhaylenko <alexm@gnome.org>
Mon, 19 Apr 2021 15:01:33 +0000 (20:01 +0500)
They were never updated after having been moved.

gsk/gl/gskglrenderer.c
gsk/ngl/gskngldriver.c

index b7c2ac43c719ae4f071f989f280c2bd369d5adc1..80936362198d7b01a0a62ba766750e5ef240156d 100644 (file)
@@ -1129,13 +1129,13 @@ compile_glshader (GskGLRenderer  *self,
     }
 
   gsk_gl_shader_builder_init (&shader_builder,
-                              "/org/gtk/libgsk/glsl/preamble.glsl",
-                              "/org/gtk/libgsk/glsl/preamble.vs.glsl",
-                              "/org/gtk/libgsk/glsl/preamble.fs.glsl");
+                              "/org/gtk/libgsk/gl/preamble.glsl",
+                              "/org/gtk/libgsk/gl/preamble.vs.glsl",
+                              "/org/gtk/libgsk/gl/preamble.fs.glsl");
 
   init_shader_builder (self, &shader_builder);
   program_id = gsk_gl_shader_builder_create_program (&shader_builder,
-                                                     "/org/gtk/libgsk/glsl/custom.glsl",
+                                                     "/org/gtk/libgsk/gl/custom.glsl",
                                                      shader_source, shader_source_len,
                                                      error);
   gsk_gl_shader_builder_finish (&shader_builder);
index ec30ccf86fc4ace8b19638497221d54ac286a3e5..b365519c18e8eba89b4dd071566c884715b720db 100644 (file)
@@ -1074,16 +1074,16 @@ gsk_ngl_driver_lookup_shader (GskNglDriver  *self,
 
       gsk_ngl_compiler_set_preamble_from_resource (compiler,
                                                    GSK_NGL_COMPILER_ALL,
-                                                   "/org/gtk/libgsk/glsl/preamble.glsl");
+                                                   "/org/gtk/libgsk/ngl/preamble.glsl");
       gsk_ngl_compiler_set_preamble_from_resource (compiler,
                                                    GSK_NGL_COMPILER_VERTEX,
-                                                   "/org/gtk/libgsk/glsl/preamble.vs.glsl");
+                                                   "/org/gtk/libgsk/ngl/preamble.vs.glsl");
       gsk_ngl_compiler_set_preamble_from_resource (compiler,
                                                    GSK_NGL_COMPILER_FRAGMENT,
-                                                   "/org/gtk/libgsk/glsl/preamble.fs.glsl");
+                                                   "/org/gtk/libgsk/ngl/preamble.fs.glsl");
       gsk_ngl_compiler_set_source_from_resource (compiler,
                                                  GSK_NGL_COMPILER_ALL,
-                                                 "/org/gtk/libgsk/glsl/custom.glsl");
+                                                 "/org/gtk/libgsk/ngl/custom.glsl");
       gsk_ngl_compiler_set_suffix (compiler, GSK_NGL_COMPILER_FRAGMENT, suffix);
 
       /* Setup attributes that are provided via VBO */